Revert "Make it possible to always show the a11y status"

This reverts commit 6ce79c62eb624f33481dee68454b41b1034052a8.

diff --git a/data/org.gnome.shell.gschema.xml.in.in b/data/org.gnome.shell.gschema.xml.in.in
index e45274eb618ab0d4b034f63fea50ef119e7f1209..bacb6b1c8ca0ddbffd2080fd5faf176c58545088 100644 (file)
--- a/data/org.gnome.shell.gschema.xml.in.in
+++ b/data/org.gnome.shell.gschema.xml.in.in
@@ -73,14 +73,6 @@ value here is from the GsmPresenceStatus enumeration.</_summary>
         menuitem in single-user, single-session situations.
       </_description>
     </key>
-    <key name="always-show-universal-access" type="b">
-      <default>false</default>
-      <_summary>Always show the Universal Access status.</_summary>
-      <_description>
-        This key overrides the automatic hiding of the Universal
-        Access status icon when no accessibility features are enabled.
-      </_description>
-    </key>
     <key name="remember-mount-password" type="b">
       <default>false</default>
       <_summary>Whether to remember password for mounting encrypted or remote filesystems</_summary>

diff --git a/js/ui/status/accessibility.js b/js/ui/status/accessibility.js
index b18af855b9487d6b27c0a710b7587f27a38ce6c0..479a15a70b13637eaca30640bb46a5541e6670e9 100644 (file)
--- a/js/ui/status/accessibility.js
+++ b/js/ui/status/accessibility.js
@@ -26,8 +26,6 @@ const KEY_ICON_THEME     = 'icon-theme';
 const KEY_WM_THEME       = 'theme';
 const KEY_TEXT_SCALING_FACTOR = 'text-scaling-factor';
 
-const KEY_ALWAYS_SHOW_UNIVERSAL_ACCESS = 'always-show-universal-access';
-
 const HIGH_CONTRAST_THEME = 'HighContrast';
 
 const ATIndicator = new Lang.Class({
@@ -73,18 +71,12 @@ const ATIndicator = new Lang.Class({
         this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
         this.menu.addSettingsAction(_("Universal Access Settings"), 'gnome-universal-access-panel.desktop');
 
-        global.settings.connect('changed::' + KEY_ALWAYS_SHOW_UNIVERSAL_ACCESS, Lang.bind (this, this._queueSyncMenuVisibility));
-
         this._syncMenuVisibility();
     },
 
     _syncMenuVisibility: function() {
         this._syncMenuVisibilityIdle = 0;
 
-        if (global.settings.get_boolean(KEY_ALWAYS_SHOW_UNIVERSAL_ACCESS)) {
-            this.actor.visible = true;
-            return false;
-        }
         let items = this.menu._getMenuItems();
 
         this.actor.visible = items.some(function(f) { return !!f.state; });